Trade and Transfer fixes