Bugfixes
Merge branch 'dev_htb'