Fixes to remove references to options functions.