Fix weird fatal issues