Fixed some more L2 bugs.