updates for latest Ubuntu
merge conflicts