More tweaks to converge on 0.13 testability.
Fixes to start compiling 0.13 ui interface.