COMP: Remove more gcc 4.9 warnings