Tidy up a couple g++ errors, but still no build