Fixed some bugs around blacklist and disabled mode