Tweaks.
Fix #287.