Build errors fixed