Final fixes for Options