Ubuntu 14.10 compilation fixes