Fixed more L4 bugs