Fixed setting declaration locations