fix backwards compat issues