Last minute additions for release 1.5.2