Resolving remaining build errors.