getEntity fix, added freeze/thaw no-ops