Fixed some issues with the service not starting.