Fixes from review comments