Fix imports, fix the usage of the new argparser