bugfixes from travis build