Some fixes that have bounced through the forks