UI waiting inconsistences fixed