Fixed usage and arg count handling