Working on a few compiler fixes/cleanup