Fix effc++-warnings