Fix params for more functions