More changes to pull

Hi Bruce,
I have accumulated more changes, both HR25 specific and generic. Please take a look and merge them as appropriate.

BTW, is it OK to send in batches like this, or would you prefer smaller patches more often?

Thanks

Tomas