More assertion updates