Fix issue with handling -m and -x for bin/s3