Fixing Build errors