Further package corrections for new project