Some corrections before releasing for testing.