Improved the validation of vulnerability models

Fixes some issues reported by Catalina.