Text related fixes