[[ Bug 11964 ]] Removed unecessary text measurment and fixed couple of
typos.