Minor fixes to get up to date