Added fixes for Travis.