Various updates for v1.1.1

* Fixes #121