Fixed some bugs caused by new driver system