minimal build fixes for uml (fallout from x86 merge)