Updated kernels to latest model + bugfixes