Fix typos, etc to get the new code compiling.