Fixes based on review comments

Fixes based on review comments