More minor fixes/changes.