[PATCH] Compilation fixes