fix small compat issues