COMP: address gcc 4.7 reported errors