CPU Hazard and NPU corrections

CPU Hazard and NPU corrections added.