changes needed for final deb build

Up to date with Adrian's repo plus 4 changes needed for final deb build