Fixes to enable serial build.