Small bugs minor changes