Compile fixes by Ross.