Param tweaks
Fix for new metrics