Bugfixes to reconnect service