Tunned grammar after migration and fix checks accordingly.
Fix grammar and check accordingly.