More fixes to resolve issues - still not quite compiling yet