Style nits and build fix.