Small changes for 2.x