Tweaks made to get through testing.