Small fixes after phone call with Nico.