dealt with issues spotted by Clang 3.3