Update to 1.8.1

- Bug fixes