Minor changes from use.