Patch for Debian Jessie: Corrections after Travis build