more 3.11.1 changes