Develop v3 apportable fixes