Partial 10.41 support