more fixes to claim lines