Final fixes before v1.0