[PATCH 0/8] cleanups and a fix