BUGFIXES
Merge branch 'bugfixes'