Fix most irregularities found by conversion tests