qorpent - compatibility fixes