Scarlet Compliance update

- Fixed things to work with latest version of Scarlet (v2.71)
- Bugfixes