Minor fixups
Merge branch 'xmethods' into merge