Tweaks (#203)