Minor changes in the 2D engine