Last minute Version 1.11 fixes