A few tweaks for better handling image assets.