Minor bug fixes for QGIS 2.0