Fixes a bunch of shitty problems