Follow up fixes for minor adjustment details.