2D bug fixes.