Fixed more 7.1 bugs