Minor fixes after updates from 3.10