* minor changes to be compiled with g++ on Ubuntu 13.10