Add restart monitoring and other tweaks