Final fixes

before tagging.