Better padding in a couple places.