Apply minor changes per 9/8 telephone discussion/issues review