Small bugs are fixed