Some tweaks to add as a windows service