fixes a few bugs
Merge pull request #6602 from paprka/fixborgiesorrysecborgsdontlynchmelaw2

Fixes a few obvious bugs