Fixes for the vulnerability changes in the backend