Tweaks from Ch 6 exercises