Finish up compile errors from branch merge.