Bug fixes in Options Menu