Pull fixes from common