Fixes #3200
Fixes #3198
Quickfix for #3194
Fixes #3201
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Merge pull request #3203 from Zuhayr/feature

Bugs.