Fix the arg position indication
Fix warnings