Requirements fixup