Fix some Travis-specific build errors.