some build errors fixed