Fix: Various fix on arguments