Tweaks from usage