Add changes from halcrow.