#160 Minor Adjustments