Fix usage message and arguments checking