Fix the core of the SAMR access functions. This passes make test, but