Attempted to Fix 2 bugs in L3.