0.96.7 Some fixes after dedicated testing

[Wyqer]

Q	A
Bug fix?	yes
New feature?	no
Needs wipe?	no

Description:

Encountered some smaller things during a test on a dedicated server with some people and fixed them.

Content:

• See commit titles

Successfully tested on:

• [x] Local MP
• [x] Dedicated MP