Fix last things preventing me from compiling the tree: