Minor corrections dealing with settings