Some fixes for the bgq kernels