Fix remaining packaging bugs