[PATCH 0/6] Various fixes and cleanups