Small text related fixes and cleanup