L2 and L4 fixes.  Look at files for specifics.