Minor adjustments/fixes to previous merges.