More assertion fixes