changes to make it compile under g++-4.7/Linux