Tweak a couple of files in order for it to compile.