Couple of other fixes for Debian....