Fixed issues with project loading