Fix some small bug around insufficient args