Bugfix and travis confs