Fixed the -core compile errors.