This PR fixes a couple of cases where the global options object is being used instead of the information being passed as arguments.
options