fixes some usages (multiple parameters mostly)