Various bug fixes for the global / local settings control.  Still a problem though.