Fixed two assertion bugs I caused yesterday