Very minor clean-up and build fix