Fixed minor bugs related to click-complete