Fix changes requested in comments