minor changes to sync with trunk