fixes to lsr to remove class typing