Various fixes to allow independent x and y scaling of text subs (#489).