Various changes before I get off