Fixes from last review