Some setting fixes