Minor bugfixes
License
...