Refactor system/exec; WARN potentially incompatible