Fix some more params