fixes to fs_snapshot handling