Bug fixes for the Options window and preferences