Parameters fixes

Change-Id: I98be70a08bd8b98b69f65338ba1630657a8fd66b