[core] Small setting fixes