COMP: fix gcc 4.9 warnings