Bug fixes in option window.