Improvements to options loading