More Babel-related fixes.