Fixed arguments handling from command line