Fix all the L1 bugs