Correctted build errors