Another round of External Core fixes