Fixed some build issues.
Again.