Bugs fixes for 6.4 parallel release.