small compat fixes