Fix when start after the Run in Background

Also kill a now useless wrapper