Final fixes for version 1.