Fixed some bugs caused by changes in runlist