fixing various FATAL observed at P1