Stabs' fixes