Fixes based Tofe's review

Fixes based Tofe's review