Fixed compiler errors, build errors