Small fixes to bring in line with changes to 3.10