Fixes for HGV params.