Improved inventory and window allocation, fixes #2200