Various minor fixes for development version.