Small bugs removed