g++ fix. Also last update made a boo boo - renamed modified files, breaking their link to the history