Minor fixes for release 0.9.2-beta