Bug fixes in Metronome