! ABP-specific fixes
