Handle args and some fix