Non-image detection tweaks.