Minor bug Fixes in MP and Rework on HZ