Fix service start problems