Additional small changes to base project