Additional various changes.