COMP: Remove gcc 4.9 warnings