Fix to transformer - code review comments.