Fixed some assertion problems