Warning fixes (now testing with Clang)