Fix some sharing issues with transitioning to ===