Fix additional build breaks and warnings.