A series of small updates for various modes.