Fix args passing to subroutines