Merging teledunet fixes