Minor changes/fixes for snap2