Fixes from text regression