Fix inconsistency in content, etc.