More stuff
More compile fixes