Fixed srl extraction bugs