Some tweaks for testing.