Fixup requirements