Updated project settings
Added fixes from 151ebb01ce43e8ad565d32b78dd7267f77db7afd