Major bug fixes to HotSpot