updates to make fpga-code instruction generation work again