more restart fixes