a couple minor bug define fixes for gcc versus clang++