e980: fixes for thinkingbridge