Small fixes for running ICV validations