Small adjustments to silence g++ under Linux