Resolve issues with swap methods

That's pretty much it