Prepare v1.1 branch
Fixes