Make changes for 6.3.