fixes from u2