correcting g++ compile errors introduced in previous commit