Fixing issues related to parameter set