Tweaks after testing.