COMP: fix some gcc 4.9.2 warnings