Fixed some build errors caused by merging my changes with Owen's.