Fixes to text labels, solves #2