Fix mapping of transient surfaces