fix some annoying shit