* Fixed swap on unmap issue, and added missing RegisterForKey