Fixes for https://github.com/Baystation12/Baystation12/issues/4173 , https://github.com/Baystation12/Baystation12/issues/4168 , https://github.com/Baystation12/Baystation12/issues/4159 , and https://github.com/Baystation12/Baystation12/issues/4038