Updated to newest compiler APIs
Minor cleanups