Fix issues with arguments of procs