quick fixes from last refactor