Fixing all sorts of shitty bugs