Final Snapshot tweaks