Cleanup and add workaround for FPGA bug.