Small bugs fix