Tweaks requested by customer