Further improved image type detection

Fixes a few more issues with detecting the image type in crash reports