Fixes for part 3 of SRS