Forcibly ending raids with /kill @e causes a bunch of stuff to break

I was playing in my survival world, and kept accidentally starting raids from illager patrols, due to my house being next to a village. To forcibly end it, I decided to use /kill @e[type=] to kill them all, however this caused 3 notable issues:

1. I can no longer trade with villagers. I believe this is related to issue MC-140026.

2. I no longer receive the bad omen effect when killing patrol captains.

3. Raid status bar freezes (seems to only last until rejoining the world)

Steps to reproduce are to just summon a raid and then use the commands:

/kill @e[type=illager]

/kill @e[type=vindicator]

/kill @e[type=ravager]

After this, the raid should end and the above issues should begin to take effect.

EDIT: This issue can be manually fixed by modifying the raids.dat and deleting any active raids.