More text consistency fixes