fixes for v1.1 issues