More fixes for warnings. Clang is generating bad code, though.