Fixes from feedback