Fix missing restart program command
Fix missing return codes