Small text related fixes