Fix Travis test errors