[PATCH 0/9] Bug fixes