Fixes to project loading