Fixes in parametric script