A few updated files missed in last commit