Changes to fix MMS in v2.1

If you're using this in the auto_retrieve method, i guess these three variables could be defined inside that method: they're not strictly a locator.