fixes for last RobustKernel commit