Fixes following to the SRS review