some fixes to make stuff i currently working on not crash the server