Fixed 5.2.3 differences.