Fixed references to options maps