changes to work on ubuntu trusty and icehouse