Fixes for Travis, now building only on GCC.