Minor fixes, mostly wrong assertions.