fixing Build errors