Fix new options-related issues