More updates so that dojo build will work without errors.