minor tweaks to alleviate clang++ warnings