[PATCH 00/13] various fixes and cleanups