Fix element names and remove transfers once they've started