A few more 7.8 tweaks