Fixup more tuts so they compile.