Hi Eric, these are fixes for the build issues I just hit after updating my source tree to the for-next branch. -Dave.