Solved some building errors