Some small fixes for release 1.90