Resolve compile problems for non-hosts