misc debian fixed from trond