Compile fixes merge.