A few changes to fix Retrieve calls for non-magic classes

Should be self explanatory with the commit messages.