Corecting bugs