Improve setting type consistency