[3.8] Fixes