Tweaks from testing installation.

For windows service, ensure run pid is deleted.