Cleanup some more upstream ...