Add changes to make building for juno work