Fatal fixes