Fixed building errors