Fixed some state cleanup on the area object.