BGRT fallback image fixes
This fixes a couple of issue with the BGRT fallback image support which was recently merged in !125 (merged) and !131 (merged).
This fixes a couple of issue with the BGRT fallback image support which was recently merged in !125 (merged) and !131 (merged).