Kernel.hpp should also be fixed.