Adjust to build dynamic cross again