More tweaks. See #1