Fix (hopefully) a loading problem for the shim
Fix a small equivalence bug
Attempt another fix for Shim loading
Merge branch 'dev'