Code

trivial changes to address warning with g++-4.2