Minor fixes to sort out compile.