9 Commits (lizzie/fix-nvmap-handles)