Add minor upstream changes; conform new debian standards