Fixing errors from Travis build 140.1