Small bugs modification