Fixes for running on ubuntu 14.04