Fix params problems