A few misc changes.