Minor changes, etc.