Fixes for stuff. I hate this library. It needs to die