Adds fixes for supporting building on Travis CI