Fix launch-proc related bugs