More bug fixes: Connection