More param tweaks