Some fixes for project creation