Feature/project create fixes