Tweaks for testing.