Bug corretions.