More compile fixes
More compile fixes