Fixed more L4 and L2 bugs.