Fixing some Windows service issues