Some bat fixes.