[3.8] Some fixes

- Fix #1410
- FIx #1409
- Fix #1412