Fixed 2.x issues