Fixes for using local settings properly.