Fixing some more 2.7 bugs