Fixes from last tests