bug fixes related to text changes