A few changes before Jeriel's push