Small C build and script fixes.