More package fixes