Apportable compatibility fixes.