Fixed some assertions