Fix
Fixes from ink review