Several misc changes.