Transports/SUNSET: Additional fixes.