minor
Final fixes