Hotfix requirements rearrangement