MCP: various fixes, plus removal of ui_bind() (just for mackie code)