Various fixes
Add restart action