Further simplify/fix project settings