Fixing Travis-CI build issues