A few minor adjustments per customer requests