Various changes to smooth running