Various fatal fixes