fixes based on the last update from Oliver on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=960065
