ac4779f Final fixes.