Fixes in kernel constructor