Some fixes in response to clarification from Trans-Mission support.