Fixed warnings exposed by a full rebuild