Develop

Initial fixes to get Linux install working again