Fix settings some more...