Fix directory checking and args amount acceptance