Minor changes to project and packages