Fix some settings <-> dashboard problems