Minor fixes for G++