Fixes for snapshot list