adjustments to kernel impls etc