[PATCH 0/7] Preliminary fixes