Fixed some build problems
Temporary