Changes for building in Linux (made in Ubuntu 12.04)