Hole Callout Issues - Extra Space in Quantity/Leading Zeros

Is there a way to eliminate the spacing that shows in the quantity of a hole callout?  For example, it's coming in as 2  x instead of 2x (See attached).  Also, is there a way to stop leading zeros from coming in with the hole callout?  All template settings are set to hide leading zeros and this works for all other dimensioning with the exception of the hole callout.

Thank You,

Justin

SolidworksDrawings And Detailing