fix up recent work on Bindings etc.