Simplification of project settings, fixes