Fixes to mr snapshot