The UMD shim does not conform to previous behavior, fix several corner cases