small changes for 2.10