Added better snapshots_to_keep handling