more compatability tweaks