Fixes to make closer to text