Fixes for model generation and projects loading