Various fixes for PoC-4 (né 3.5)