more fixes for 1.1 release