Pulled in compilation fixes from refactor02.