range of fixes after Ubuntu 14.04 test