New hazard needs minor fixes