Resolving build errors.