Transporter fixes