Few small tweaks for testing.