Several patches from Daniel P. Barrange, Red Hat inc. (TNX!)