MANTA-17 More param tweaking