More package fixes.