There's some unresolved issues after the Aanthirin facelift merge that were discussed in the organization channel on Discord. mothpot has said he's working on some fixes, but in case they can't make it in time (edit: mothpot said they won't), I'm uploading the fixes for the issues that I found.

Probably best to merge only after mothpot's fixes. These fixes might possibly no longer be necessary after that, but I'll probably not be online for the final bugfixing push to check.