even more fixes from u2