Fixes to Variant Images implementation