Travis update + minor fixes