[PATCH 0/5] various fixes