Could you create an issue to fix these up?