compat. fixes