Fix types, more content.