Fix some desktop settings bugs