Changes for potential cross builds