[TASK] Some cleanups and missing argument passing