tweaks that work with 7.1.x