Add misc changes.