Adjustments per @skirpichev's requests.