Small Bugfixes
Merge branch 'entw'