Ubuntu 14.04 compilation fixes