Build fixes for travis.