Repairing other issues raised in some comments
Repairing other issues raised in some comments