Issue #4: Some fixes for transmission module by @vitlav