Fix minor concerns.