Various style and build fixes.