Added and corrected some assertions