COMP: get rid of more GCC 4.8.2 warnings