More multi-target support (still not finished...)
Fix initial build