Fix some out of tree build issues.