Minor thoughtless fixes to make it compile.