Anthon - Small bugfixes