tweaks for compatibility with newer stuff