Fixes from review feedback