Merge "Fix failures after div support."