[PATCH 0/3] Tweaks to mode handling