A few fixes for Marmot and Hyrax

Andy, these changes are necessary to fixup Marmot and Hyrax.  After they are updated we can remove the deprecated methods, since that change is not backwards compatible, we'll need to merge this first.