Last minute minor changes