Some minor assertion updates to fix errors cropping up