Fix up some build stuff