Offline selfdeploy fixes