Merge branch 'simple-bugfixes' into 'master'

Simple bugfixes

If you're pinned, a swap with a friendly still takes energy.

Was going to outright disable it, but doctornull talked me out of it?