Fixes to compensate for occasionally broken SRL