Fix some L3 bugs