Some build errors were fixed