performance and compatability tweaks