[PATCH v2 0/4] various minor bug fixes