fix some annoying changes