revert coconnor to 499 and other compat fixes