Bugfixes for data connection.