Fixing travis for pull requests + minor changes