Fix for issues reported on SVACE tool for CA