Fixes to get tests running on trusty.