Minor fixes to make things compile.

--BRJ