Fixed a couple of build problems with 12.2.0 XMOS tools.