Fixed target/host builds