some changes towards 4.9