compat fixes (retry...)