More compile fixes