Fixed a few theoretically-possible issues with invenswappers