Fix several small problems with TH2 drawing