Minor fixes for release 3.18 and 3.19.