bugfixes merged from test channel