Issue #1: Tweaks