Additional misc changes.