Small tweaks and fixes to SRS.