Feature/travis build

Multiple small fixes, see commit messages.