[PATCH 0/3] Fixes for 11.7