Fixes for review comments