Fixup Requirements