[PATCH 0/4] various fixes