fix a few annoying changes