[PATCH 0/6] Workaround building improvements