Further work towards the 1.1 release