Fix the things I broke against 7.1