Fixed settings bugs