fix a bunch of oddities which arose during the merge