Minor setting fixes.