Make packager more robust