Prepare for a common codebase.
Fix minor compile errors.