Travis-CI fixes according to review