Bugfixes after integration testing on Ubuntu