Debian Jessie support: Small fixes