Minor tweaks to improve interoperability.