Minor asthetics and restart changes