Fixes to options