Backporting fixes