Fixed setting issues