more stupid fixes from u2