Update arguments to new system
Fixed some issues