Build errors have been fixed