Tweaks from simlay.