2D bug fixes