Fixes to v1.1