Several smaller changes.