This should reduce the occurences of travis failures on MacOS Also fix some linter warnings
Attach a file by drag & drop or click to upload
