Fix refactor args parsing, fix type conversion for announce