Fixing compile errors as I type this up.