Fixes for review feedback