FIXUP: fixes to runtime
FIXUP: host fixes