Minor fixes for Mistral to compile under latest clang.