Last few changes for version 1.5.6.