Some fixes for transport merge

A few lint fixes and some variable assignment fixes