Adaptations for Travis build