Some last changes I don't remember making