Improved Transmission support (thx @stechico)