Small bugs correction