Fixed arguments to the kernel so that they hopefully make more sense