Support of 2.41 and fixes