[Fpm] Preparing before the unix black patch