franapoli further minor package fixes