Fixes for multiple windows munging preferences