Minor fixes/changes.