Merged in fixes and package info from Debian