Some small changes for release 1.16