hammerhead: fixes for thinkingbridge