Started fixing compilation errors on Ubuntu 2013.04