Fixes in srs