L4 fixes pass 1.