More bugfixes on WL kernel