fixes + backcompat test