fix some backwards compat issues