Fix some L2 bugs