some changes for 2.6.32