Add a couple more files from latest core