Install fixes

Fix the install process (from git) to work correctly for anyone.