Fixed some halt issue