Bugfixes on service start.