More compile fixes.