Another set of fixes for outline