Travis build fixes

Fixing errors reported by Travis build.