Fixed some out-of-tree build issues