Make it compile
More fixes
So far so good