Minor updates for 3.10