Resolving numerous build errors.