I AM DIE: More little patches

Detected I AM DIE update.