Fixes after running the Travis build test.