Thanks for the fixes!
I merged the PR manually, mainly to format the commit message (as per https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md#com...), breaking it per modules in order to be safer when backporting to avoid conflicts.