Fixes from review