More fixes to the location files are installed into