Fix some issues on toeicCtrl and toeicApp