Small bugs fixes.