Beauty fixes