Intermediate commit of fixes, before merge.