Additional 1.1 changes