fix some things that got broken in last change