COMP: Get rid of gcc 4.8 warnings