TW: More fixes for new snapshot version.