fixes https://github.com/Baystation12/Baystation12/issues/4730 , https://github.com/Baystation12/Baystation12/issues/4686, https://github.com/Baystation12/Baystation12/issues/4675
Merge pull request #4734 from DJSnapshot/hotfix

Fixes, for real this time