Some fixes for snapshots.