Resolve complaints from g++