various fixes for 1.1.10